Upgrade rust-installer to v2
authorBrian Anderson <banderson@mozilla.com>
Fri, 12 Dec 2014 02:04:34 +0000 (18:04 -0800)
committerBrian Anderson <banderson@mozilla.com>
Mon, 29 Dec 2014 19:42:31 +0000 (11:42 -0800)
Makefile.in
src/rust-installer

index fd03484a07714414aed49e4bede7dbd46261af0e..049a0929bad05d7f616dc27e0f0a02c8a7e07078 100644 (file)
@@ -178,7 +178,9 @@ $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-image-$(1)
                --work-dir=./$$(DISTDIR_$(1)) \
                --output-dir=./$$(DISTDIR_$(1)) \
                --non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
-               --package-name=$$(PKG_NAME)-$(1)
+               --package-name=$$(PKG_NAME)-$(1) \
+               --component-name=cargo \
+               --legacy-manifest-dirs=rustlib,cargo
        rm -Rf $$(IMGDIR_$(1))
 
 install-$(1): $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz
index aed73472416064642911af790b25d57c9390b6c7..3a37981744a5af2433fed551f742465c78c9af7f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit aed73472416064642911af790b25d57c9390b6c7
+Subproject commit 3a37981744a5af2433fed551f742465c78c9af7f